projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ecb32ba
7e4b275
)
bitkeeper revision 1.1159.224.2 (41ee77e18OOk0KBi4oHdlAKXiDtTxw)
author
kaf24@scramble.cl.cam.ac.uk
<kaf24@scramble.cl.cam.ac.uk>
Wed, 19 Jan 2005 15:08:17 +0000
(15:08 +0000)
committer
kaf24@scramble.cl.cam.ac.uk
<kaf24@scramble.cl.cam.ac.uk>
Wed, 19 Jan 2005 15:08:17 +0000
(15:08 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
1
2
linux-2.6.10-xen-sparse/drivers/xen/console/console.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
linux-2.6.10-xen-sparse/drivers/xen/console/console.c
Simple merge